diff --git a/bt-wifi-firmware-util/Android.mk b/bt-wifi-firmware-util/Android.mk
index cdfefe4..7e41a35 100644
--- a/bt-wifi-firmware-util/Android.mk
+++ b/bt-wifi-firmware-util/Android.mk
@@ -18,7 +18,7 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := TIInit_11.8.32.bts
-ifeq ($(TARGET_PRODUCT),hikey960)
+ifneq ($(filter hikey960, $(TARGET_DEVICE)),)
 LOCAL_SRC_FILES := TIInit_11.8.32-pcm-960.bts
 else
 LOCAL_SRC_FILES := TIInit_11.8.32.bts
@@ -40,7 +40,7 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := wl18xx-conf.bin
-ifeq ($(TARGET_PRODUCT),hikey960)
+ifneq ($(filter hikey960, $(TARGET_DEVICE)),)
 LOCAL_SRC_FILES := wl18xx-conf-wl1837mod.bin
 else
 LOCAL_SRC_FILES := wl18xx-conf.bin
diff --git a/device-common.mk b/device-common.mk
index 18b6282..56fedc0 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -101,8 +101,7 @@
     android.hardware.sensors@1.0-service \
     android.hardware.sensors@1.0-impl \
     android.hardware.contexthub@1.0-service \
-    android.hardware.contexthub@1.0-impl \
-    sensors.$(TARGET_PRODUCT)
+    android.hardware.contexthub@1.0-impl
 
 # Nanohub tools
 PRODUCT_PACKAGES += stm32_flash nanoapp_cmd nanotool
diff --git a/gralloc960/Android.mk b/gralloc960/Android.mk
old mode 100755
new mode 100644
index 9d615f9..0435779
--- a/gralloc960/Android.mk
+++ b/gralloc960/Android.mk
@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ifeq ($(TARGET_PRODUCT),hikey960)
 LOCAL_PATH := $(call my-dir)
 
 # Include platform specific makefiles
@@ -70,7 +69,6 @@
 # HAL module implemenation, not prelinked and stored in
 # hw/<OVERLAY_HARDWARE_MODULE_ID>.<ro.product.board>.so
 include $(CLEAR_VARS)
-include $(BUILD_SYSTEM)/version_defaults.mk
 
 ifeq ($(TARGET_BOARD_PLATFORM), juno)
 ifeq ($(MALI_MMSS), 1)
@@ -161,5 +159,3 @@
 LOCAL_MODULE_OWNER := arm
 
 include $(BUILD_SHARED_LIBRARY)
-
-endif
diff --git a/hikey/device-hikey.mk b/hikey/device-hikey.mk
index b5b6bd9..fe6b6b6 100644
--- a/hikey/device-hikey.mk
+++ b/hikey/device-hikey.mk
@@ -38,5 +38,8 @@
 # PowerHAL
 PRODUCT_PACKAGES += power.hikey
 
+# Sensors HAL
+PRODUCT_PACKAGES += sensors.hikey
+
 # Include vendor binaries
 $(call inherit-product-if-exists, vendor/linaro/hikey/device-vendor.mk)
diff --git a/hikey960/device-hikey960.mk b/hikey960/device-hikey960.mk
index 6899a06..49ed263 100644
--- a/hikey960/device-hikey960.mk
+++ b/hikey960/device-hikey960.mk
@@ -38,5 +38,7 @@
 
 PRODUCT_PACKAGES += power.hikey960
 
+PRODUCT_PACKAGES += sensors.hikey960
+
 # Include vendor binaries
 $(call inherit-product-if-exists, vendor/linaro/hikey960/device-vendor.mk)